# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1387+1.1327.4.24 -> 1.1388 # arch/i386/kernel/process.c 1.51.1.1 -> 1.53 # kernel/ksyms.c 1.203.1.2 -> 1.206 # include/linux/timex.h 1.5.1.3 -> 1.11 # include/asm-sparc/unistd.h 1.20.1.1 -> 1.23 # include/linux/sched.h 1.151.1.2 -> 1.154 # kernel/fork.c 1.124.1.2 -> 1.126 # include/asm-sparc64/unistd.h 1.19.1.1 -> 1.22 # arch/i386/kernel/traps.c 1.52.1.2 -> 1.54 # drivers/acpi/pci_root.c 1.13.1.2 -> 1.16 # include/linux/pci_ids.h 1.103.1.2 -> 1.105 # include/asm-alpha/unistd.h 1.18.1.3 -> 1.22 # include/linux/pci.h 1.90.1.5 -> 1.92 # drivers/serial/Makefile 1.14.1.3 -> 1.19 # include/linux/sunrpc/svc.h 1.20.1.3 -> 1.24 # arch/ppc64/kernel/process.c 1.35.1.1 -> 1.38 # fs/proc/base.c 1.42.1.7 -> 1.47 # include/linux/time.h 1.16.1.1 -> 1.18 # include/asm-i386/unistd.h 1.25.1.1 -> 1.27 # Makefile 1.410.1.2 -> 1.413 # include/linux/highmem.h 1.25.1.2 -> 1.28 # kernel/sched.c 1.193.1.2 -> 1.195 # drivers/acpi/osl.c 1.37.1.1 -> 1.39 # include/linux/jbd.h 1.21.1.16 -> 1.24 # arch/alpha/kernel/traps.c 1.24.1.2 -> 1.27 # kernel/timer.c 1.59.1.1 -> 1.61 # drivers/serial/Kconfig 1.8.1.2 -> 1.12 # net/sunrpc/svc.c 1.21 -> 1.22 # diff -Nru a/Makefile b/Makefile --- a/Makefile Fri Jun 27 22:42:00 2003 +++ b/Makefile Fri Jun 27 22:42:00 2003 @@ -213,7 +213,7 @@ NOSTDINC_FLAGS = -nostdinc -iwithprefix include CPPFLAGS := -D__KERNEL__ -Iinclude -CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ +CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -g -O2 \ -fno-strict-aliasing -fno-common AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) diff -Nru a/drivers/acpi/osl.c b/drivers/acpi/osl.c --- a/drivers/acpi/osl.c Fri Jun 27 22:42:00 2003 +++ b/drivers/acpi/osl.c Fri Jun 27 22:42:00 2003 @@ -250,7 +250,14 @@ irq = acpi_fadt.sci_int; #ifdef CONFIG_IA64 - irq = gsi_to_vector(irq); + int vector; + + vector = acpi_irq_to_vector(irq); + if (vector < 0) { + printk(KERN_ERR PREFIX "SCI (IRQ%d) not registerd\n", irq); + return AE_OK; + } + irq = vector; #endif acpi_irq_irq = irq; acpi_irq_handler = handler; @@ -268,7 +275,7 @@ { if (acpi_irq_handler) { #ifdef CONFIG_IA64 - irq = gsi_to_vector(irq); + irq = acpi_irq_to_vector(irq); #endif free_irq(irq, acpi_irq); acpi_irq_handler = NULL; diff -Nru a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c --- a/drivers/acpi/pci_root.c Fri Jun 27 22:42:00 2003 +++ b/drivers/acpi/pci_root.c Fri Jun 27 22:42:00 2003 @@ -23,6 +23,8 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include + #include #include #include @@ -246,8 +248,6 @@ switch (status) { case AE_OK: root->id.segment = (u16) value; - printk("_SEG exists! Unsupported. Abort.\n"); - BUG(); break; case AE_NOT_FOUND: ACPI_DEBUG_PRINT((ACPI_DB_INFO, @@ -309,7 +309,12 @@ * PCI namespace does not get created until this call is made (and * thus the root bridge's pci_dev does not exist). */ +#ifdef CONFIG_X86 root->bus = pcibios_scan_root(root->id.bus); +#else + root->bus = pcibios_scan_root(root->handle, + root->id.segment, root->id.bus); +#endif if (!root->bus) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Bus %02x:%02x not present in PCI namespace\n", diff -Nru a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h Fri Jun 27 22:42:00 2003 +++ b/include/linux/sched.h Fri Jun 27 22:42:00 2003 @@ -512,9 +512,10 @@ */ extern struct exec_domain default_exec_domain; -#ifndef INIT_THREAD_SIZE -# define INIT_THREAD_SIZE 2048*sizeof(long) -#endif +#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR +# ifndef INIT_THREAD_SIZE +# define INIT_THREAD_SIZE 2048*sizeof(long) +# endif union thread_union { struct thread_info thread_info; @@ -522,6 +523,9 @@ }; extern union thread_union init_thread_union; + +#endif /* !__HAVE_ARCH_TASK_STRUCT_ALLOCATOR */ + extern struct task_struct init_task; extern struct mm_struct init_mm; diff -Nru a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h --- a/include/linux/sunrpc/svc.h Fri Jun 27 22:42:00 2003 +++ b/include/linux/sunrpc/svc.h Fri Jun 27 22:42:00 2003 @@ -73,7 +73,7 @@ * This assumes that the non-page part of an rpc reply will fit * in a page - NFSd ensures this. lockd also has no trouble. */ -#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 1) +#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2) static inline u32 svc_getu32(struct iovec *iov) {